*** empty log message ***

diff --git a/etc/ChangeLog b/etc/ChangeLog
index ee400932a8acab17775dc60e49c341239fc541ec..08ba8e09fe9859df1fd4d76d3745b92511356feb 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-07  Kenichi Handa  <handa@m17n.org>
+
+       * NEWS: Mention how to disable character translation for a file.
+
 2006-06-04  Sven Joachim  <svenjoac@gmx.de>
 
        * de-refcard.tex: Update for Emacs 22: Use German quotes

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 576fcad3c556776ba39504af426319b3ecd0cc84..306a658b849bd61bdf930137eb1de9b8a60368fb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-07  Kenichi Handa  <handa@m17n.org>
+
+       * international/mule.el (find-auto-coding): Don't handle the short
+       name `char-trans'.
+
+       * files.el (hack-local-variables-prop-line)
+       (hack-local-variables): Cancel the previous change.
+
 2006-06-06  Jesper Harder  <harder@phys.au.dk>
 
        * ediff-diff.el (ediff-test-utility): Protect against